Fixes for r48930:

* Use user's language since it falls back to content if the message wasn't modified in user's language
* Fix a typo in RELEASE-NOTES

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 04843b4..427df04 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -152,8 +152,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add a class if 'missingsummary' is triggered to allow styling of the summary
   line
 * Add CSS defintion of the 'wikitable' class to shared.css
-* (bug 17163) Added MediaWiki:Talkpage which will be displayed when viewing talk
-  pages
+* (bug 17163) Added MediaWiki:Talkpageheader which will be displayed when
+  viewing talk pages
 * Add group convertsion support for LanguageConverter. New magic word "{{GROUPCONVERT:xxx}}"
   enabled for this new feature. You can set related conversion rules in
   [[MediaWiki:Groupconversiontable-xxx/language_code]].

diff --git a/includes/Article.php b/includes/Article.php
index 1cc12f1..cedc19d 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -867,8 +867,8 @@ class Article {
 
                # Allow a specific header on talk pages, like [[MediaWiki:Talkpagetext]]
                if( $this->mTitle->isTalkPage() ) {
-                       if ( wfMsgForContent( 'talkpageheader' ) != '-' ) {
-                               $wgOut->wrapWikiMsg( "<div class=\"mw-talkpageheader\">\n$1</div>", array( 'talkpageheader', 'options' => array( 'content' ) ) );
+                       if ( wfMsg( 'talkpageheader' ) != '-' ) {
+                               $wgOut->wrapWikiMsg( "<div class=\"mw-talkpageheader\">\n$1</div>", array( 'talkpageheader' ) );
                        }
                }